From 919dda4fac32cde1e449d79ea8f47201144d952d Mon Sep 17 00:00:00 2001 From: Gert Wollny Date: Tue, 20 Jun 2017 22:02:50 +0000 Subject: [PATCH] remove ICONV patches, glibc version is to be used --- debian/control | 1 - debian/patches/localcharset-include.patch | 11 ----------- debian/patches/series | 2 -- debian/rules | 3 --- 4 files changed, 17 deletions(-) delete mode 100644 debian/patches/localcharset-include.patch diff --git a/debian/control b/debian/control index 79a61228..256ef943 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,6 @@ Priority: optional Build-Depends: cmake, debhelper (>= 9), libcharls-dev, - libunistring-dev, libpng-dev, libsndfile1-dev, libssl-dev, diff --git a/debian/patches/localcharset-include.patch b/debian/patches/localcharset-include.patch deleted file mode 100644 index 8590a907..00000000 --- a/debian/patches/localcharset-include.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/ofstd/libsrc/ofchrenc.cc -+++ b/ofstd/libsrc/ofchrenc.cc -@@ -288,7 +288,7 @@ - - #include - #ifdef WITH_LIBICONV --#include -+#include - #endif - - #define ILLEGAL_DESCRIPTOR OFreinterpret_cast(iconv_t, -1) diff --git a/debian/patches/series b/debian/patches/series index 59fd2928..c7ae9103 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,5 +6,3 @@ 06_soversion_abi.patch 07_dont_export_all_executables.patch 08_remove_system_processor.patch - -localcharset-include.patch diff --git a/debian/rules b/debian/rules index 39595348..bc97d603 100755 --- a/debian/rules +++ b/debian/rules @@ -36,9 +36,6 @@ CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE:STRING=None \ -DDCMTK_WITH_TIFF:BOOL=ON \ -DDCMTK_WITH_ZLIB:BOOL=ON \ -DDCMTK_WITH_ICONV:BOOL=ON \ - -DLIBICONV_LIBRARY:FILEPATH=/lib/$(DEB_HOST_MULTIARCH)/libc.so.6 \ - -DLIBCHARSET_LIBRARY:FILEPATH=/lib/$(DEB_HOST_MULTIARCH)/libc.so.6 \ - -DLIBCHARSET_INCLUDE_DIR:FILEPATH=/usr/include \ -DUSE_COMPILER_HIDDEN_VISIBILITY:BOOL=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DDCMTK_INSTALL_DATDIC:STRING=share/libdcmtk11 \ -- 2.30.2